move core::hint::black_box under its own feature gate #84216

RalfJung · 2021-04-15T09:22:42Z

The black_box function had its own RFC and is tracked separately from the test feature at #64102. Let's reflect this in the feature gate.

To avoid breaking all the benchmarks, libtest's test::black_box is a wrapping definition, not a reexport -- this means it is still under the test feature gate.

rust-highfive · 2021-04-15T09:22:45Z

r? @Mark-Simulacrum

(rust-highfive has picked a reviewer for you, use r? to override)

Mark-Simulacrum · 2021-04-15T12:01:36Z

library/core/src/hint.rs

 #[cfg_attr(not(miri), inline)]
 #[cfg_attr(miri, inline(never))]
-#[unstable(feature = "test", issue = "50297")]
+#[unstable(feature = "bench_black_box", issue = "64102")]


Hm, shouldn't this not use bench in the name? Is black_box taken?

This is the name of the RFC.

Mark-Simulacrum · 2021-04-22T00:34:07Z

@bors r+

bors · 2021-04-22T00:34:08Z

📌 Commit 03900e4 has been approved by Mark-Simulacrum

move core::hint::black_box under its own feature gate The `black_box` function had its own RFC and is tracked separately from the `test` feature at rust-lang#64102. Let's reflect this in the feature gate. To avoid breaking all the benchmarks, libtest's `test::black_box` is a wrapping definition, not a reexport -- this means it is still under the `test` feature gate.

jyn514 · 2021-04-23T15:28:16Z

@bors r-

Failed in rollup: #84477 (comment)

RalfJung · 2021-04-24T16:51:32Z

I grepped the sanitizer tests and they should be all good now...
@bors r=Mark-Simulacrum

bors · 2021-04-24T16:51:33Z

📌 Commit 56c0fb6 has been approved by Mark-Simulacrum

move core::hint::black_box under its own feature gate The `black_box` function had its own RFC and is tracked separately from the `test` feature at rust-lang#64102. Let's reflect this in the feature gate. To avoid breaking all the benchmarks, libtest's `test::black_box` is a wrapping definition, not a reexport -- this means it is still under the `test` feature gate.

bors · 2021-04-25T02:02:52Z

☔ The latest upstream changes (presumably #84310) made this pull request unmergeable. Please resolve the merge conflicts.

rust-log-analyzer · 2021-04-25T09:48:14Z

The job x86_64-gnu-llvm-10 failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot)

.................................................................................................... 9400/11781
.................................................................................................... 9500/11781
.................................................................................................... 9600/11781
.......i......i..................................................................................... 9700/11781
.....................................................iiiiiii..iiiiii.i.............................. 9800/11781
.................................................................................................... 10000/11781
.................................................................................................... 10100/11781
.................................................................................................... 10200/11781
.................................................................................................... 10300/11781
---
Suite("src/test/assembly") not skipped for "bootstrap::test::Assembly" -- not in ["src/tools/tidy"]
Check compiletest suite=assembly mode=assembly (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu)

running 35 tests
iiiiiiiiiiiiiiiiiiiiiiiiiiiiiii....
test result: ok. 4 passed; 0 failed; 31 ignored; 0 measured; 0 filtered out; finished in 0.12s

 finished in 0.183 seconds
Check compiletest suite=incremental mode=incremental (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu)
---
Suite("src/test/debuginfo") not skipped for "bootstrap::test::Debuginfo" -- not in ["src/tools/tidy"]
Check compiletest suite=debuginfo mode=debuginfo (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu)

running 116 tests
iiiiiiiiii..ii...i.i..ii....i.i....ii..........iiii.........i.....i...i.......ii.i.ii.....iiii.....i 100/116
test result: ok. 78 passed; 0 failed; 38 ignored; 0 measured; 0 filtered out; finished in 2.31s

 finished in 2.383 seconds
Suite("src/test/ui-fulldeps") not skipped for "bootstrap::test::UiFullDeps" -- not in ["src/tools/tidy"]
---
Suite("src/test/run-make") not skipped for "bootstrap::test::RunMake" -- not in ["src/tools/tidy"]
Check compiletest suite=run-make mode=run-make (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu)

running 25 tests
iiiiiiiiiiiii............

 finished in 3.261 seconds
Build completed successfully in 0:32:55
+ python2.7 ../x.py --stage 2 test src/test/mir-opt --host= --target=i686-unknown-linux-gnu
---
Check compiletest suite=ui mode=ui (x86_64-unknown-linux-gnu -> i686-unknown-linux-gnu)

running 11781 tests
......................i............................................................................. 100/11781
.....................................iiiii..iii.iiiiiiiii........................................... 200/11781
.................................................................................................... 400/11781
.................................................................................................... 500/11781
..............................................................................................i..... 600/11781
.................................................................................................... 700/11781
---
.................................................................................................... 9300/11781
.................................................................................................... 9400/11781
.................................................................................................... 9500/11781
.................................................................................................... 9600/11781
.......i......i.....................................................iiiiiii......................... 9700/11781
.....................................................iiiiiii..iiiiii.i.............................. 9800/11781
.................................................................................................... 10000/11781
.................................................................................................... 10100/11781
.................................................................................................... 10200/11781
.................................................................................................... 10300/11781

RalfJung · 2021-04-25T10:12:13Z

CI failure looks spurious:

error: failed to download from https://crates.io/api/v1/crates/dirs-sys/0.3.5/download

@bors r=Mark-Simulacrum

bors · 2021-04-25T10:12:14Z

📌 Commit 3d16e15 has been approved by Mark-Simulacrum

bors · 2021-04-25T10:35:28Z

⌛ Testing commit 3d16e15 with merge 06f0adb...

bors · 2021-04-25T13:16:32Z

☀️ Test successful - checks-actions
Approved by: Mark-Simulacrum
Pushing 06f0adb to master...

rust-highfive · 2021-04-25T13:16:57Z

📣 Toolstate changed by #84216!

Tested on commit 06f0adb.
Direct link to PR: #84216

💔 miri on windows: test-pass → test-fail (cc @oli-obk @RalfJung @eddyb).
💔 miri on linux: test-pass → test-fail (cc @oli-obk @RalfJung @eddyb).

@oli-obk

Tested on commit rust-lang/rust@06f0adb. Direct link to PR: <rust-lang/rust#84216> 💔 miri on windows: test-pass → test-fail (cc @oli-obk @RalfJung @eddyb). 💔 miri on linux: test-pass → test-fail (cc @oli-obk @RalfJung @eddyb).

rust-highfive assigned Mark-Simulacrum Apr 15, 2021

rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Apr 15, 2021

This comment has been minimized.

Sign in to view

RalfJung force-pushed the black-box branch from d0c8dbf to 7ce6b29 Compare April 15, 2021 09:38

This comment has been minimized.

Sign in to view

RalfJung force-pushed the black-box branch from 7ce6b29 to 03900e4 Compare April 15, 2021 10:32

Mark-Simulacrum reviewed Apr 15, 2021

View reviewed changes

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Apr 22, 2021

This was referenced Apr 22, 2021

Rollup of 10 pull requests #84424

Closed

Rollup of 10 pull requests #84425

Closed

Dylan-DPC-zz mentioned this pull request Apr 22, 2021

Rollup of 12 pull requests #84432

Closed

Dylan-DPC-zz mentioned this pull request Apr 22, 2021

Rollup of 11 pull requests #84454

Closed

Dylan-DPC-zz mentioned this pull request Apr 23, 2021

Rollup of 13 pull requests #84477

Closed

bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Apr 23, 2021

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Apr 24, 2021

Dylan-DPC-zz mentioned this pull request Apr 25, 2021

Rollup of 7 pull requests #84535

Closed

bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Apr 25, 2021

RalfJung added 2 commits April 25, 2021 11:08

move core::hint::black_box under its own feature gate

23d54ad

fix sanitizer tests

3d16e15

RalfJung force-pushed the black-box branch from 56c0fb6 to 3d16e15 Compare April 25, 2021 09:08

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Apr 25, 2021

bors added the merged-by-bors This PR was explicitly merged by bors. label Apr 25, 2021

bors merged commit 06f0adb into rust-lang:master Apr 25, 2021

rustbot added this to the 1.53.0 milestone Apr 25, 2021

rust-highfive mentioned this pull request Apr 25, 2021

miri no longer builds after rust-lang/rust#84216 #84553

Closed

bors mentioned this pull request Apr 25, 2021

Start working on proof of concept for exposing Backtrace in core #77384

Closed

RalfJung deleted the black-box branch April 26, 2021 08:06

SparrowLii mentioned this pull request Apr 29, 2021

Update aarch64 linux feature detection rust-lang/stdarch#1146

Merged

matthiaskrgr mentioned this pull request Oct 16, 2023

ice: 'ty::Const::eval' called on a non-valtree-compatible type #116796

Closed

matthiaskrgr mentioned this pull request Nov 2, 2024

ICE: When translating generic parameters from DefId, the expected specialization failed to hold #132519

Open

move core::hint::black_box under its own feature gate #84216

move core::hint::black_box under its own feature gate #84216

Uh oh!

Conversation

RalfJung commented Apr 15, 2021

Uh oh!

rust-highfive commented Apr 15, 2021

Uh oh!

This comment has been minimized.

This comment has been minimized.

Mark-Simulacrum Apr 15, 2021

Choose a reason for hiding this comment

Uh oh!

RalfJung Apr 15, 2021

Choose a reason for hiding this comment

Uh oh!

Mark-Simulacrum commented Apr 22, 2021

Uh oh!

bors commented Apr 22, 2021

Uh oh!

jyn514 commented Apr 23, 2021

Uh oh!

RalfJung commented Apr 24, 2021

Uh oh!

bors commented Apr 24, 2021

Uh oh!

bors commented Apr 25, 2021

Uh oh!

rust-log-analyzer commented Apr 25, 2021

Uh oh!

RalfJung commented Apr 25, 2021

Uh oh!

bors commented Apr 25, 2021

Uh oh!

bors commented Apr 25, 2021

Uh oh!

bors commented Apr 25, 2021

Uh oh!

rust-highfive commented Apr 25, 2021

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

8 participants